add new schemes, some fixes