build unfinished file

+minor bugs