one class manual input
various bug fixes
line bugfix