Removed some warnings and added in stuff