Small fixes and reogranization