Removed bugs and source section