various changes, long time no commit