Small fixes, added some comments for future fixes.