Cleanup. Added some warnings and stuff to do.