Bug fixes and compiled