finish adding spring security and misc things