when you took it appart, was it tight? if it was and now it isnt, something went wrong. maybe there is dirt in the threads or the lens is missing a spacer or an element is put in upside down. the spanner may have bruised the notches and thats hanging it up?
take the glass out and try figuring out whats going on.
as for aligning it... a collimeter is the best tool but you can do some rough adjustment by using a ground glass on the film plane while focusing to infinity.