Slight bugs fixed