Bug fixes and modularization