Fixed and improved core codebase;