Added asset loading file
Small changes and bug fixes