Fixed some things with bicycle
valasFUPA
merge conflict resolved